From: Benjamin Otte <otte@redhat.com>
Date: Sat, 14 Jan 2012 03:05:19 +0000 (+0100)
Subject: css: parse 'currentColor' for symbolic colors
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~18214
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=c2fb3158784f092782dbcfc09a4338299be64922;p=gtk%2B3.0.git

css: parse 'currentColor' for symbolic colors
---

diff --git a/gtk/gtkcssstylefuncs.c b/gtk/gtkcssstylefuncs.c
index b46b9b0c99..0045f93996 100644
--- a/gtk/gtkcssstylefuncs.c
+++ b/gtk/gtkcssstylefuncs.c
@@ -321,9 +321,16 @@ symbolic_color_value_parse (GtkCssParser *parser,
 {
   GtkSymbolicColor *symbolic;
 
-  symbolic = _gtk_css_parser_read_symbolic_color (parser);
-  if (symbolic == NULL)
-    return FALSE;
+  if (_gtk_css_parser_try (parser, "currentcolor", TRUE))
+    {
+      symbolic = gtk_symbolic_color_ref (_gtk_symbolic_color_get_current_color ());
+    }
+  else
+    {
+      symbolic = _gtk_css_parser_read_symbolic_color (parser);
+      if (symbolic == NULL)
+        return FALSE;
+    }
 
   g_value_take_boxed (value, symbolic);
   return TRUE;